merge folders and replace files from zip, don't replace zips themselves